Merge.
authorSteven Smith <ssmith@xensource.com>
Fri, 27 Apr 2007 12:31:09 +0000 (13:31 +0100)
committerSteven Smith <ssmith@xensource.com>
Fri, 27 Apr 2007 12:31:09 +0000 (13:31 +0100)

Trivial merge